From a9912f2e78c4ed54d1b517dda5cbdd5044359396 Mon Sep 17 00:00:00 2001 From: Lars Hamann Date: Thu, 30 Jul 1998 10:52:35 +0000 Subject: [PATCH] removed a few unneeded lines * gtk/gtkclist.c (gtk_clist_motion): removed a few unneeded lines --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkclist.c | 25 ++++++------------------- 8 files changed, 34 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index c78b3fa725..527dc7f5a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Jul 30 12:39:36 1998 Lars Hamann + + * gtk/gtkclist.c (gtk_clist_motion): removed a few unneeded lines + Wed Jul 29 23:31:50 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_motion): column resize now works with diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c78b3fa725..527dc7f5a0 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +Thu Jul 30 12:39:36 1998 Lars Hamann + + * gtk/gtkclist.c (gtk_clist_motion): removed a few unneeded lines + Wed Jul 29 23:31:50 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_motion): column resize now works with diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c78b3fa725..527dc7f5a0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Thu Jul 30 12:39:36 1998 Lars Hamann + + * gtk/gtkclist.c (gtk_clist_motion): removed a few unneeded lines + Wed Jul 29 23:31:50 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_motion): column resize now works with diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c78b3fa725..527dc7f5a0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Thu Jul 30 12:39:36 1998 Lars Hamann + + * gtk/gtkclist.c (gtk_clist_motion): removed a few unneeded lines + Wed Jul 29 23:31:50 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_motion): column resize now works with diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c78b3fa725..527dc7f5a0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Thu Jul 30 12:39:36 1998 Lars Hamann + + * gtk/gtkclist.c (gtk_clist_motion): removed a few unneeded lines + Wed Jul 29 23:31:50 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_motion): column resize now works with diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c78b3fa725..527dc7f5a0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Thu Jul 30 12:39:36 1998 Lars Hamann + + * gtk/gtkclist.c (gtk_clist_motion): removed a few unneeded lines + Wed Jul 29 23:31:50 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_motion): column resize now works with diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c78b3fa725..527dc7f5a0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Thu Jul 30 12:39:36 1998 Lars Hamann + + * gtk/gtkclist.c (gtk_clist_motion): removed a few unneeded lines + Wed Jul 29 23:31:50 1998 Lars Hamann * gtk/gtkclist.c (gtk_clist_motion): column resize now works with diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index ecf54b04ea..b7c8786bd2 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -2266,7 +2266,7 @@ gtk_clist_finalize (GtkObject * object) * gtk_clist_expose * gtk_clist_button_press * gtk_clist_button_release - * gtk_clist_button_motion + * gtk_clist_motion * gtk_clist_size_request * gtk_clist_size_allocate */ @@ -2964,8 +2964,8 @@ gtk_clist_motion (GtkWidget * widget, x = event->x; new_column_width (clist, i, &x, &visible); - /* Welcome to my hack! I'm going to use a value of x_drage = -99999 to - * indicate the the xor line is already no visible */ + /* Welcome to my hack! I'm going to use a value of x_drag = -99999 + * to indicate that the xor line is already invisible */ if (!visible && clist->x_drag != -99999) { draw_xor_line (clist); @@ -3063,25 +3063,12 @@ gtk_clist_motion (GtkWidget * widget, } } - if (y < 0) + if (ROW_TOP_YPIXEL(clist, row) < 0) move_vertical (clist, row, 0); - else if (y >= clist->clist_window_height) + else if (ROW_TOP_YPIXEL(clist, row) + clist->row_height > + clist->clist_window_height) move_vertical (clist, row, 1); - else if (GTK_CLIST_DRAG_SELECTION (clist)) - { - /* dragging inside clist_window */ - if (ROW_TOP_YPIXEL(clist, clist->focus_row) + clist->row_height <= 0) - gtk_clist_moveto (clist, clist->focus_row, -1, 0, 0); - else if (ROW_TOP_YPIXEL (clist, clist->focus_row) < 0) - gtk_clist_moveto (clist, clist->focus_row, -1, 0, 0); - else if (ROW_TOP_YPIXEL (clist, clist->focus_row) >= - clist->clist_window_height) - gtk_clist_moveto (clist, clist->focus_row, -1, 1, 0); - else if (ROW_TOP_YPIXEL (clist, clist->focus_row) + clist->row_height > - clist->clist_window_height) - gtk_clist_moveto (clist, clist->focus_row, -1, 1, 0); - } return FALSE; } -- 2.30.2